From: Colin Walters <walters@verbum.org>
Date: Thu, 17 Mar 2011 20:26:49 +0000 (-0400)
Subject: ShellAppSystem: Only search gnomecc.menu for preferences
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~8481
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=c97a8602a182b77e4cee75df13eb7f30ce836a2f;p=gnome-shell.git

ShellAppSystem: Only search gnomecc.menu for preferences

settings.menu was removed in gnome-menus commit
b68bcd27f44ce2c494f6e3cd9695890b9c02af04; gnomecc.menu is the intended
replacement.

(On Red Hat Linux derived systems, settings.menu continues to exist)

https://bugzilla.gnome.org/show_bug.cgi?id=645063
---

diff --git a/src/shell-app-system.c b/src/shell-app-system.c
index 7bd4b1251..b52625a0a 100644
--- a/src/shell-app-system.c
+++ b/src/shell-app-system.c
@@ -200,7 +200,7 @@ shell_app_system_init (ShellAppSystem *self)
    * case by case.
    */
   priv->apps_tree = gmenu_tree_lookup ("applications.menu", GMENU_TREE_FLAGS_INCLUDE_NODISPLAY);
-  priv->settings_tree = gmenu_tree_lookup ("settings.menu", GMENU_TREE_FLAGS_NONE);
+  priv->settings_tree = gmenu_tree_lookup ("gnomecc.menu", GMENU_TREE_FLAGS_INCLUDE_NODISPLAY);
 
   priv->app_change_timeout_id = 0;